local updates
Merge https://github.com/hk81189i/treasurehunt
server update