More EMD Things, fixed bug