Bug fixes + ignores verify command