fixed input to selfclosing and updated other spans