various minor fixed