fixed various things