found several major speed improvements /cc #7