Adding some spacing and better messages