Updates typos and handler

Updates typos and handler utils