fixed various