more changes, forgot some files