Models updated, and bug fix.
(+ know bug)