minor changes; gotta do better with moves remaining.