minor changes; getting ready to make a new branch