updated to comments from mailing list

incorporated comments, but not yet additional helpers