Merged dev stuff into main and cleaned up

Fixed main file and removed old code remnants.  Fixed issue with prints
being required so much smoother now.
Merge remote-tracking branch 'origin/master'

Conflicts:
	sim.py