Speedup improvements, attribute table fixes