* better form convert * fixed other forms * changed to use npm package * better form convert * merge fix * fixed mapper test