minor changes ( mostly because of https://github.com/Davidiusdadi/websync )