Fixes, and added company names.