major fixes in sync from server