cleaned up some coments and fixed typos