added tags
hacked in what i need from pull requests