improving readability and fixing some errors in messages