commit from last night...
 mostly markup changes