more comments and improved COND