Fixed battle system, graphics updates, etc