Bugfixes and ebola tutorial work