Fixed issue with getting caught and added the ability to disable buttons.
More minor fixes.
Working towards the battle UI.