main fixes 2