bug fixing and updates