reorganisation of bashrc & some other small changes