all issues discussed in demo 2 - solved.