Bug fixes

refactor of AI and Kills