bunch of work on ensemble
fixing stuff