Improved messages

Whoops