changes for readability, two minor fixes