misc work, fixed model loading problem as well