bug fixes and scroll demo