Some Fix and Additions