git'ified
add a bit more state info
to fix the back button...