some fields parsing added, some bugs fixed