some changes and stuff