some bashrc cleanup and changes