Added OBP
Fixed SLG and OBP calculations, added OPS