Develop sync

nothing revolutionary but some works/cleaning/preparation