Improved saving functionality to decrease loading time if the classifier is not to be retrained.
Bug and whitespace fix.