proposed resolution to comment-43
fix for comment-36
fix a few long lines