more typos, removed redundant list calls, etc