fixed 2 bugs + fieldinfos