#28 Fixing and cleaning up.
Loads without errors now