fixed various stuff