fixed various minor things