Restored scrolling and fixed misc bugs