minor additions, finalised to upload it to CTAN