Stages are now numbered in current-stats, and js-fixes