Logged-on user keyboard setting bug fixed, plus some comment clean-up