Further tweaks to v0.1