some more changes and stuff