Added new "Demux" API
Rejigger JSDocs