Update to 1.6.2

Cleaned up some code and updated everything to 1.6.2