some changes here and there
stuff changed