implemented unique variables; fixed type prop bug