added some 3g fixes
merged