Cleanup, various tweaks