fix derp & revert some commit