(^) error msgs
(^) minor adjusts
(*) should be in previous commit