made some changes and stuff