Minor Tweaks

Minor tweaks but things will change significantly in the next couple of
days.