fix bugs, sample app