(ENoC)  Debugging

Changes detailed in last commit message!