added missing handles
added more handles, display turns off