General improvements, figuring out scroll