XPT changes, speed improvements, v0.31