Small modifications, going home
this may break stuff, git did weird things on the merge