Changed some init stuff