great bug fixing and update