selection sync and small fixes