Code comments fix

Fix some small comments issues and mistakes