fixed up classes to work properly with the loaders, also tidied up some source code