Added registration logic + message, fixed typo