Minor Tweaks pt2

- Couple stuffs
- Fixed Comments