added some aliases, removed some functions, ...