Formatting and a few API changes.