Made a bunch of changes re sams comments