fixed a few field related bugs