Some more fixes. No longer thinking about complete design shift.