minor fixes before trying to put in battle animations