update scroll and small fixes