add git ignore and improve field parsing