Add new demo controllers, improve existing