Fixed mistakes and improved.