Bugfixes and more interactiveness