Fixed short tags, company name & license info.