Better styling of error messages
Edited TODO