commiting a lot of forgoten changes