Better tags

Pull request for better_tags