Multiple changes for coming 0.2 release.