updates from comments from mark
...