All figures replace with TikZ. Minor fixes