last commit

I hope I covered everything