EMMA code now includes master and slave, works

Cosmetic changes to libraries