split up mean model definitions for clarity
more model notation tweaks