Added messages, bug fixes