Fixed error in refactoring
Update changes to neural nets
complete merge