0021: some cosmetics...