Layer changes, other small fixes