architecture, nag fix and browser fix