lots more little changes