Please can we take this lot - various bug fixes and code tidies.