tweaking here and there of comments and things, nothing major
sizes of types had changed, which sort of surprised me... we need to agree on this once and for all.