fixed a mistake, improved the bash aliases
fixed bugs, made more universal.