removed bools from structures, now returning NULL on EOF
fixed some names for structs + other stuff