cocopro: added ability to mix latent and non-latent factors;
         cleaned up some old code;