Rename a bunch of stuff, Add LoaderParameters, clean some code