fixing brian's stupid bugs