Some adjustments and fixes.