most sync... important change

style and other