v0.5 with fixes