I made some changes that I think should be included with the official version.