fixed many inaccuracies