noted: and done (I'll leave notes as I work through the improvements)