straightening out more indexes/FK