A bunch of changes for version 0.9.0