bug fixes; drop logging