all round fixes