db changes

trying to get the db to work alot better and easier but thanks to my
adhd got really super confused. Sorry if these changes are completely
screwed up.