Several updates to utils

Updates to how files are included
Adds args_util
Fixes several issues