Pulling in some small changes... removing some compiler warnings, added a speed test.