More small ajustments