Small fixes and comments
Fix
Fix