Multiple new settings and mappings. General cleaning and sprucing up