Small corrections and improvements
Toggle, dispose