Minor Changes

Added "path" /fmc only order
Attempted to fix entity tracking error
Other small cleanups