minor bug fixes and superficial adjustments.