bug fixes
improved models