Make models extend observable
Fix typo