bunch more changes