Done. This is all the time I will have to contribute to this... for now :)