Done, thanks. I'll make a separate pull request for the others.