continued fixes