Final HFDF Tweaks... maybe