Scroll follow + some corrections