A few little updates :-)