Updated remaining model paths to new singular convention.
Fixed a couple of memory leaks.