Some demo source tweaking and pom changes