[@Sep] Thanks for the suggestions, all edited in.