close to fixing formand parse bugs