Comment tweaks and fixed typo in error message.