fixed some typos; removed some aliases