Corrections to the setup of lisa.
Also did more corrections on emma.