Fixing typo and stuff