speed fixes
speed fixes