some bug fixes away from a playable combat system