Minor editing
Working on merge
Another commit, sorry, my commit messages are awful