Minor reorganization, and fixed nasty saved-changes-light bugs