few changes

+ fields table (reducing code length)