few tweaks to make for the sample app