getting a proper query
updated data import, better number support, enums
further data import