Fixing a couple small issues and tagging v1