Fixed bugs, but not the ones causing the problems I'm seeing.