minor tweaks, minor bug fix, tags

Hey Jakub — one more, just a few minor tweaks and fixes. Also added v1.0 tags. Sorry for not getting this in the previous request!

-- Jesse