Updated bias subtraction
Fixed merge conflicts.