last derp fixes for  part II of the big overhaul :D (released new version)