More CS handling of @
Improved the event handling and API calls
Updated the JavaScript and the documentation