minor code tidies and changed 'auto draw' function so 'draw finished' message is displayed