Made mirages implicit and some cosmetic fixes.