Minor fixes and big improvement to example app