Removed AuthListener and fixed some typos