Also cleans up some weird code
Limited to (relatively) sane values until we eventually get around to adjusting UI to allow higher extermities.