Fix multiple Huxleyfiles, misc CLI