Clean Up

This cleans a few things up, and otherwise includes a commit that it probably shouldn't (updateWeight).

but, there doesn't seem to be much harm in including it.

After merging this, the bootstrapping process should be updated so that a new wallet is made and that a sibling is created.