Simplified .bashrc and some minor changes