Update some bits fix some errors