Made the changes, hope I'm not too presumptuous.