Worked on AI targeting, fixed a couple of bugs, added some TODOs