Fixed some setup issues and other rejigging