small updates
FIxed merge in bash_aliases