bug fixes with handle_name and old comments partial