Multiple layers!
and more fixes