Adds fixes from this evening's testing.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Final.mif