Cleared most of the problems