Adding scrollTo, minor fixes