remove dead commented code. fixed misc. typos