removed consolemessages, added comments