minor fixes, and more topics covered