testing new layers
Various fixes