added pointset builder
merged pointset changes