Tweaks as the code begins to be used.