Correcting typos
updating & deprecating
final