minor progress and refactoring with Mach-O