Comment clarification
Setting some defaults; $is_intermediate fix