allowing spaces for tags
merge
arranging some code in models
merging files