comments, fixes, code revision