Cosmetic improvements + .merlin

nothing to see here...