-By Benjamin. Fix bugs.