did some speed fixes