Added the Contains method, fixed some names.