Some bugs fixed

prep-ing for release