fixed a couple bugs, started to add colors
added some battle-related stuff