Macho Pick-Up + Fix-Ups