GetMainVerb Method and other changes