Still in review mode, minor fixes, some comments