bring over blunt tweaks
Prep for last 0.25 release