V2.0 smallfixes

Lots of fixes based on feedback from @noahadams and @b1tr0t !