Further tweaks and fixes, including adding a new roommate's partner challenge for penis-haver