Tagged a few more issues which I will be working on for the 2.0.0. Will proba...