cleaned up and fixed some print messages