#450868 by mrfelton: fixes naming of parameters , also does some improvements for the overriding of various variables