removed some message, added todos
enemy shit
merge