some fixes
some erp derp