Version 1.6: Bugfixes galore