Minor clarifications to instructions and error handling fixes