Added more mods
Latest changes in bashrc and aliases
Fix merge