Fixed a some bad expression and inaccuracy