more tweaks, add git prompting