Submodules
Improve comments and remove unused mappings
Fix iterm typo