fixes to layers. labels on everything