various model fixes