Removed two traps and fixed some typo errors