Added a message
Fixed bugs