Making progress on v0.5 - tweaks still needed