Some fixing and additions

But skip the updated readme - it's for me and my brain :-)