Cleared up some parts