reworked a ton of stuff to get clean data into db