update number of field variable types, further bug fixes