added _ statements to everything that was complaining about not being able to match everything