1. more error code
2. fix a performance problem