Tweaks to text output and startup