updated field names / bugs