minor 500 ajusts + auto refresh