Finalized for master

Ironed out a few bugs to get game ready for master