Formatting changes, and enhancements to the inferfaces