Change company name and other minor tweaks