Changed some logoutput also did some preps for refactoring