refactor prediction script; update notebook; add more figures