more layer adjustments from greg2