added messages, style changes