More comments and error handling