Fixed small graphical issues and added in bubbles around targeted enemies.
Finished merge.