several fields parsing added/improved