Add tags

And some other minor tweaks.