minor bug fixes with loader etc.