refactor and git-shelve (git stash tweaks)
bug fix