a bunch more changes