bug fix; clean-up