misc issues
Merge dev_xue into dev