fixing various minor details