cleanup and extra test

glmer-2.R is a (temporary) modular version of glmer-1.R