made some changes to stuff