fixing some nei stuff and oyster gen stuff + various bugfixes