Improve some console output messages and errors