Various fixes and style changes.