changing debug output
Merge branch 'master' into cardecide

Conflicts:
	SIM
Again, reworking debugging output
Removing magic numbers, moving functions higher up in file so they don't clutter the running code up