mode back & improvement issues