Add in-field check
Fix comments
Use unified addition formula
More notes