Logging system done, test file improved, saving before code cleaning