handle history better; include git status in prompt; general cleanup