Prototype V1.02

Other bug fixes