added scrolling when nececessary; minor method changes