1. -Polish code.
1. -Fix a crash bug in release mode.