update

Fix some issues