few clean up changes before app store submission