Changed increment buttons, added some combat move stuff