Feature parity with previous jQuery-based version

Now for some new features