Updated messages, amended minor error