QA code review (iteration #1): non-critical bugs & typos etc..

just a bit of tidying.