Ditch require.js, minor fixes to run.