Updated version, less bugs but still phonegap broken