misc cleanup
added EM demo which seems to work!