edited span and todo
fixing intro ems
fixing intro ems