several fixes for things that were botched on #200