Get more data driven. Fix numerous bugs.