Mostly style changes and some new modules.