Added more messages, fixed bugs