bug fixes continue