Fixed up some shifting mechanics, etc