Some fixes and added #caller
Ported more specs to bootstrap
More fixes