improved formatting, comments, and some bug fixes
Merge origin/master

Conflicts:
	Loaders/ClassLoader.php