Fixed buglets by rolling back and redoing some.