remove comments; add BMarsh