Added some data for v16 modules, updated style

this is still early work at this stage and should not be analyzed just
yet.