Model cleanup work & bug fixes