Fixed some crash issues, updated default mappings.