Minor fixes and taggable gem added