Update and fix some bug