minor fixes and demo back again!