various little changes