fix some bits...