Minor changes
Commented out annoying mappings
Additional config files