Correct English and bugfix