mt-core
- small refactoring
- update bootstrap