fix bugs reported by users