fix logger
correct order loading bundles
refactoring Clock and command clock:format