bashrc: clean; other minor changes