More tweaks
release 0.22.0