more responsive fixes except for iphone