6/26 hotfixes

small bug fixes with layering and a couple of typos