More layers!

Everything but the mua should be correct.
Also removed some debugging code.