[v0.1.3] minor design changes