been working on 2nd round of Firefae's edits today.