few bugfixes, added demo