Design enhancements, bug fixings.