bug fixes, scroll bar and demo