added some aliases
merged source