[fixes] small Bugfixes
[major] grid improvements, cleanup demo file