Fixing bugs after testing on real device before release v 1.0