Minor tweaks
More rebranding