fixed block variable names xcode didn't include
improved shared client