Finishing & fixing typo