Improve comments within code, fix typos