fixed various elements