Add missing array size
Use sub-struct here
enabler hasn't changed
More verification, and a few minor fixes
A few more verifies