main fixes 1