A few fixes to make this usable by Roger. Hopes to explain a lot here also.