added dependencies and corrected paths...
demo/ collapsing data and a bug fix