Error and warnings cleanup. CLP added.