social and minor fixes