a lot of changes. A problem with before/after not working properly with features. Have to add these in manually.

Signed-off-by: unknown <trpb2@EPIDPC147.mrc-epid.cam.ac.uk>