bug fixes
bug fixes with scroll calculate