Increased app speed

Should now run twice the speed, still a bit on the slow side