small fixes, cleanups