Improve formatting, add new companies