finish fixes for removal of 'each'; fix html injection in demo code