Update some comments
Fix quality flaws