bug fixes and charge/attack functionality