cleanup no-capital edge case, add sort