fixes, cleanups, etc