bi refactoring
fixes
bug with preloader freeze. Not fixed