Some more cleaning up. Fixed discrepencies during saving operation that reported the wrong outcome.