Update hard-coded types and add some new manual bitcoin types