minor fixes, cleanups