changed some initialisation things