ongoing fixes