Small bugfix and a little progress on Task 5