Added more aliases and a function update.