wacky mac fixes, more to come