comment cleanup and Adding a few components