update more code to new default handling
code/comment clarification