clean up and more console message updates