Pull request for simple tags and fixes

Yay, simplicity!