Formatted things, modified path to work with mach