Orientation and small fixes