fixed multiple build path errors, and corrected logic

drew/josh
mws