FIX: various formatting & presentation issues