Add some user friendly messages
Update notes display + fixes