some bugfixing and renaming dev/app to demo