quick fixes fixed quickly for  0.2.1

~~**NOT READY FOR MERGE**~~