fixed issues reported by client