Adding more structure and functionality to create the W mem expansion.
Minor fix.