added remaining tags (except for image)

first working version - needs double-checking and image tag logic