John Pasula:
	- Some more code clean up.
	- Remove unneeded ;'s
	- Add GUI by iamcal.
