DRMP: Tweaks (especially style)