finished demo app / minor modifications