Minor Tweaks

-- minor tweaks