bugfix: fields; cleanup;