Minor fixes to demo and additons to pom