Hardeded computedproperties and added some type checking