Cleaned up layers 14, 15, and most of 16 although there are still some issues there.