Some Improvements after review