maps controller
fixing combos