Misc. fixes and improvements

* Compound tags
* Better docs
* Fixes #2