may fixes and add imgs. v0.12