simplified return code for R0 <= 1, removed unnecessary update flag suffix for "add", code cleanup