some fixes & cleanups
cleanup