minor tweaks; ordering to match ikkiku