add cabocha and modify a bit