Fixed first bug report and tidied code.
Noted tidied in Changes, in case people notice.