random fixes 3