Fixing documentation and updating demo a bit