bug fixes up the wazoo