Added catch and pass commands.
Other tuning based upon testing.