updates to bootstrap const, foo1
tombstone struct added