improve some comments and fix 'f rom' typo