cleanups, minor fixes