Added messages, fixed indentation