prototype_v2

fixed a couple bugs