fixed stuff, v0.02