Some minor changes for release 0.1!