sync with local changes and wifi fix