update some issues
merged