fix up some bugs
fix some versioning problems