2.0.1.0

Lots of bug fixes and misc things