Fixed plotting routine to produce proper labeles