Fixed a few bugs on companies and identation