testing ahead/behind
Added feature from testing: more diverse status recognising
diverged hopefully fixed
rearranged todos
period
Tidier down output