fixed a few bugs, tagging new version