Fixed PS1 word-wrap and more aliases