Small fixes and a first threesome with Eric+David