Emi - various bug fixed (12pm)