fixes, cleanups