bug fixing, updates improvement