some more todos
better sync structure, added logger