Several small changes, most of which are just cosmetic