[broken] refactoring continued

- fixed loader and kickstart