Various minor internal changes

- Added delegated constructor
- Removed make_bootstrap
- Added some comments, updated //TODOs