commiting a lot of old changes that were missed