added a housemate label and some transition fixes