Finished comparative fixes. Bug still persists.