added require.js stuff, fixed progress