Some tweaks and cleanup.