some more updates, need to work on scroll