Latest fiddling; add lots of Opt_ things (need to parse these properly).