Changed some things, and did not leave a very good commit message