Debug cruft removal, minor changes to the Contact Bubble.