Some improvements + prose.io