some fixes per yongwei
final fixes