update to fix additional bugs