Added COMMENTS and some fixes.