some changes to some stuff