James D. Callahan III:
	- Preliminary (and extremely painful) cleanup and refactoring.
Adavak:
	- typo
