comments fix, also the credit for the latest commit goes to @edanbe