Bug fix + tidy-up