derp
fix some comments
Merge branch 'qcheck'

Conflicts:
	Main
	Main.hs
derp