re-read std140 rule 9 and the std430 relaxation, fixed up code accordingly