Update to Foundation 4
Minor tweaks for comments
Foundation 4.0.4 upgrade