Further docs and refactoring of demo and dependencies