Update and add some important things