Clin

Fixed some FX
CLint

merge changes