more changes and stuff