Added functions and aliases; slight prompt changes