performance tests improved, and also tested the offset code