more rawhide fixes; sedition
Checkpointing WIP for tonight