- more requirejs and dependency bugfixes