fixes & cleanups