Made minor error changes. Please be wary of TODOs throughout doc