Fixed some messages, logic and user input sanitisation.