Add Comments and refactor imports
Fix field in models field
Merge branch 'api'