cleaned up unnecessary messages, name changes