fix cruft
fix color abbreviations
move code block
add other git stages
get detached branch