first changes to get Emma running without installing