Various improvements and additions
Add bashrc?