a few fixes/changes in prep for re-image