main fixes 3