Added updates from @unusualbob, fix semicolon preference.