More additions and style changes