key_commit: Fixed a lot of changes that I accidentally overwrote on one of my commits