Better phone version and some bugs fixed