Typofixes
Forking and branching and merging, oh my