Cleanup, tweaks and bug fixes.