minor changes to all the classess + removing of unnessesery output