Fixed some original problems.