More wizard improvements. Improved data binding. Adapting component/entity data system.