Finished remaining issues and enhancements.