random fixes 2