a few caroline fixes