more layer fixes
not sure what I did, but just want to check it in and go.