Minor patching, some work on the auto-organizer tool.