better error messages and updated combine