Changed some small things in the init