improve everywhere

x