the rest of the changes are minor fixes