v0.03 improvements