Several enhancements / fixes for dancer.js