add 'r/'m sprite mappings, remove a few annoyances