Edited stuff - sorry for the bad commit messages