Made a lot of changes I need to commit, but was to lazy to do so.