More defs
+ use longtable
+ corrections