fixed up relations, added some generated crap by mistake, just leave it for now