reverted some things and minor cleanups