bug fixing and update