added more; corrections