Cleaned up and fixed run errors.