bugfixes
bugfixes and minor improvements
better demo, small bugfixes
grunt