bugfixes and design issues