Misc tuning, fixes etc
Added (unfinished) demo project.