Fix tags form
Cleanup
Add comments
Add user comments
Merge branch 'comments'