#28 Fixing and cleaning up.