fix bootstrap things

Fixes #363
Fixes #366
Fixes #388