Further work on analyze.js