more changes, WIP combat