Dropped actions, added messages, better class naming and other improvements.