Some small fixes, scrolling still quite buggy