applied good fixes