moved modular code to lmer/glmer for real

some test tweaking
attempt to rename VarCorr components, now commented out until further thought