added latest model changes, fixed build