made some more changes and stuff