main fixes 5