Resume v0.12

more bugs