split up bashrc, misc updates