Changed the ps1
Clean up and some new aliases
Some clean up and more aliases