More mappings added in comments, thanks to manuals