2.1 Release

Its done. Fixed all my blunders... I hope