Fixed several inaccuracies