Added contact type switch. Corrected typos