Bug Fixes and Function Flattening

Several functions are no-longer defined ever-time certain methods are run.

A couple improper uses of the variable path has been corrected, fixing some edge-case bugs.