fixed olives-server + updated emily