changed increment, added move, little odds and ends...