Bugfixes and design updates