.bashrc_2 clean-up
Minor fixes