loader and model fixes