Fixed constants

Still getting ready for turn overhaul.