Fixed some issues
Updated models