More work further fixing and pushing to play store.