A couple fancy updates here and there