changed some settings, added some stuff