bug fixes and design additions