And some rendering issues fixed