work
stuff
stuff
Merge branch 'v3' into v3.5
add array capacity
fix more bugs