fields, fixing some bugs.