cleaned up

a bit. Still no tags are read. ;(