Fixes and changes for Play store release part #1