did a LOT of work on tags
fixes some things