Finished demo app
Misc fixes