fixed scrolling issue where content height wasn't being calculated before the Scroller object was instantiated
fixed scrolling issue where content height wasn't being calculated before the Scroller object was instantiated
file cleanup to merge