pre correcting interfaces
some cleanups