misc updates for making app store-ready