Update multilayer src to 5.2

Also fixes a couple of minor bugs.  Largest feature is the use of
the NEEDS_TO_BE_SET paradigm.