end of misc fixes 1