a lot of changes that i forgot to upload