Replace DataPoint figure with TikZ and some small fixes.