removed some commentsw
commented out old stuff, added comments to look at
removed unneeded functionaility
Parameter.Type -> Parameter.DataType